Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 9 Mar 2024 09:18:53 +0000 (04:18 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 9 Mar 2024 09:18:53 +0000 (04:18 -0500)
commit7405f0340b5ebfc8ccb903554d6d2d586611ccca
tree146e1531ffb899ef2cde009e1f0637738fb8e060
parent5d9a8c3704c156cccea90a46362e6bfae0de87f2
parentb9f7a2274f6a8352085d01c15bf9086ffe25f437
Merge from origin/emacs-29

b9f7a2274f6 ; Improve documentation of 'minibuffer-allow-text-propert...
5ffcca121bb ; Improve documentation of image properties
6e801077ae8 ; * src/composite.c (composition_compute_stop_pos): Add c...
doc/lispref/display.texi
doc/lispref/minibuf.texi
lisp/image.el
src/composite.c